From 16d14a9d462de3983232d8c8d7cd8744387a9488 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Tue, 15 May 2018 19:32:50 -0600 Subject: [PATCH] fix travis packages, rpath. --- .travis.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7110bd1e0..4704d9ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,6 @@ addons: - valgrind - xsltproc - libxml2-utils - - qt5-default - - qtbase5-dev - - libqt5webkit5-dev - - qttools5-dev-tools - - qttranslations5-l10n - libusb-dev - docbook-xml - docbook-xsl @@ -38,9 +33,17 @@ matrix: - compiler: gcc env: - USE_DOCKER=true + addons: + apt: + sources: + packages: - compiler: clang env: - USE_DOCKER=true + addons: + apt: + sources: + packages: before_install: - if [ "${USE_DOCKER}" = "false" ]; then source "/opt/qt${QT_VERSION}/bin/qt${QT_VERSION}-env.sh"; fi @@ -52,6 +55,7 @@ install: script: - if [ "${USE_DOCKER}" = "true" ]; then ./docker_hook; fi - - if [ "${USE_DOCKER}" = "false" ]; then ./build_and_test; fi + - if [ "${USE_DOCKER}" = "false" ]; then LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi + - ./gpsbabel -D 1 - if [ "${USE_DOCKER}" = "false" ]; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file - if [ "${USE_DOCKER}" = "false" ]; then cd gui; QMAKE=/opt/qt${QT_VERSION}/bin/qmake LINUXDEPLOYQT=../linuxdeployqt ./makeappimage.sh; fi -- 2.30.2